<!DOCTYPE html>
<html lang=en>
<head>
    <!-- so meta -->
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="HandheldFriendly" content="True">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
    <meta name="description" content="git 多用户冲突解决 . 标签： git合并 2017-06-09 08:43 44人阅读 评论(0) 收藏 举报 . 分类： git （4） . 版权声明：本文为博主原创文章，未经博主允许不得转载。 目录(?)[+] git多用户冲突一场景：dev 分支修改了 File1，master 分支更新了远端代码后也修改了 File1 的同一个代码块，dev 变基到 master 时会产生冲突解决方">
<meta property="og:type" content="article">
<meta property="og:title" content="git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET">
<meta property="og:url" content="http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/index.html">
<meta property="og:site_name" content="TmoonSite">
<meta property="og:description" content="git 多用户冲突解决 . 标签： git合并 2017-06-09 08:43 44人阅读 评论(0) 收藏 举报 . 分类： git （4） . 版权声明：本文为博主原创文章，未经博主允许不得转载。 目录(?)[+] git多用户冲突一场景：dev 分支修改了 File1，master 分支更新了远端代码后也修改了 File1 的同一个代码块，dev 变基到 master 时会产生冲突解决方">
<meta property="og:locale" content="en_US">
<meta property="article:published_time" content="2016-08-02T21:09:45.000Z">
<meta property="article:modified_time" content="2020-01-07T10:48:14.885Z">
<meta property="article:author" content="Tmoonlight">
<meta name="twitter:card" content="summary">
    
    
        
          
              <link rel="shortcut icon" href="/images/favicon.ico">
          
        
        
          
            <link rel="icon" type="image/png" href="/images/logo2.gif" sizes="192x192">
          
        
        
          
            <link rel="apple-touch-icon" sizes="180x180" href="/images/logo2.gif">
          
        
    
    <!-- title -->
    <title>git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET</title>
    <!-- styles -->
    
<link rel="stylesheet" href="/css/style.css">

    <!-- persian styles -->
    
      
<link rel="stylesheet" href="/css/rtl.css">

    
    <!-- rss -->
    
    
<meta name="generator" content="Hexo 4.2.0"></head>

<body class="max-width mx-auto px3 ltr">
    
      <div id="header-post">
  <a id="menu-icon" href="#"><i class="fas fa-bars fa-lg"></i></a>
  <a id="menu-icon-tablet" href="#"><i class="fas fa-bars fa-lg"></i></a>
  <a id="top-icon-tablet" href="#" onclick="$('html, body').animate({ scrollTop: 0 }, 'fast');" style="display:none;"><i class="fas fa-chevron-up fa-lg"></i></a>
  <span id="menu">
    <span id="nav">
      <ul>
         
          <li><a href="/">Home</a></li>
         
          <li><a href="/about/">About</a></li>
         
          <li><a href="/archives/">Writing</a></li>
         
          <li><a href="/projects_url">Projects</a></li>
        
      </ul>
    </span>
    <br/>
    <span id="actions">
      <ul>
        
        <li><a class="icon" href="/2016/08/09/Git%E5%88%86%E6%94%AF%E7%AE%A1%E7%90%86%E7%AD%96%E7%95%A5-%E9%98%AE%E4%B8%80%E5%B3%B0%E7%9A%84%E7%BD%91%E7%BB%9C%E6%97%A5%E5%BF%97/"><i class="fas fa-chevron-left" aria-hidden="true" onmouseover="$('#i-prev').toggle();" onmouseout="$('#i-prev').toggle();"></i></a></li>
        
        
        <li><a class="icon" href="/2016/08/01/%E4%B8%B4%E6%97%B6%E4%BE%BF%E7%AC%BA/"><i class="fas fa-chevron-right" aria-hidden="true" onmouseover="$('#i-next').toggle();" onmouseout="$('#i-next').toggle();"></i></a></li>
        
        <li><a class="icon" href="#" onclick="$('html, body').animate({ scrollTop: 0 }, 'fast');"><i class="fas fa-chevron-up" aria-hidden="true" onmouseover="$('#i-top').toggle();" onmouseout="$('#i-top').toggle();"></i></a></li>
        <li><a class="icon" href="#"><i class="fas fa-share-alt" aria-hidden="true" onmouseover="$('#i-share').toggle();" onmouseout="$('#i-share').toggle();" onclick="$('#share').toggle();return false;"></i></a></li>
      </ul>
      <span id="i-prev" class="info" style="display:none;">Previous post</span>
      <span id="i-next" class="info" style="display:none;">Next post</span>
      <span id="i-top" class="info" style="display:none;">Back to top</span>
      <span id="i-share" class="info" style="display:none;">Share post</span>
    </span>
    <br/>
    <div id="share" style="display: none">
      <ul>
  <li><a class="icon" href="http://www.facebook.com/sharer.php?u=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/" target="_blank" rel="noopener"><i class="fab fa-facebook " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://twitter.com/share?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&text=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-twitter " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.linkedin.com/shareArticle?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-linkedin " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://pinterest.com/pin/create/bookmarklet/?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&is_video=false&description=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-pinterest " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="mailto:?subject=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET&body=Check out this article: http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/"><i class="fas fa-envelope " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://getpocket.com/save?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-get-pocket " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://reddit.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-reddit " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.stumbleupon.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-stumbleupon " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://digg.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-digg " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.tumblr.com/share/link?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&name=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET&description=" target="_blank" rel="noopener"><i class="fab fa-tumblr " aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://news.ycombinator.com/submitlink?u=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&t=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-hacker-news " aria-hidden="true"></i></a></li>
</ul>

    </div>
    <div id="toc">
      <ol class="toc"><li class="toc-item toc-level-1"><a class="toc-link" href="#git-多用户冲突解决"><span class="toc-number">1.</span> <span class="toc-text"> git 多用户冲突解决 </span></a><ol class="toc-child"><li class="toc-item toc-level-4"><a class="toc-link" href="#git多用户冲突一"><span class="toc-number">1.0.0.1.</span> <span class="toc-text">git多用户冲突一</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#git多用户冲突二"><span class="toc-number">1.0.0.2.</span> <span class="toc-text">git多用户冲突二</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#null"><span class="toc-number">1.0.0.3.</span> <span class="toc-text"></span></a></li></ol></li></ol></li></ol></li></ol>
    </div>
  </span>
</div>

    
    <div class="content index py4">
        
        <article class="post" itemscope itemtype="http://schema.org/BlogPosting">
  <header>
    
    <h1 class="posttitle" itemprop="name headline">
        git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET
    </h1>



    <div class="meta">
      <span class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">
        <span itemprop="name">TmoonSite</span>
      </span>
      
    <div class="postdate">
      
        <time datetime="2016-08-02T21:09:45.000Z" itemprop="datePublished">2016-08-03</time>
        
      
    </div>


      

      

    </div>
  </header>
  

  <div class="content" itemprop="articleBody">
    <h1 id="git-多用户冲突解决"><a href="#git-多用户冲突解决" class="headerlink" title=" git 多用户冲突解决 "></a><a href="http://blog.csdn.net/twilightdream/article/details/72953313" target="_blank" rel="noopener"> git 多用户冲突解决 </a></h1><p>.</p>
<p>标签： <a href="http://www.csdn.net/tag/git" target="_blank" rel="noopener">git</a><a href="http://www.csdn.net/tag/%e5%90%88%e5%b9%b6" target="_blank" rel="noopener">合并</a></p>
<p>2017-06-09 08:43 44人阅读 <a href="http://blog.csdn.net/twilightdream/article/details/72953313#comments" target="_blank" rel="noopener">评论</a>(0) 收藏 <a href="http://blog.csdn.net/twilightdream/article/details/72953313#report" target="_blank" rel="noopener" title="举报">举报</a></p>
<p>.</p>
<p>分类：</p>
<p>git <em>（4）</em></p>
<p>.</p>
<p>版权声明：本文为博主原创文章，未经博主允许不得转载。</p>
<p>目录<a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="系统根据文章中H1到H6标签自动生成文章目录">(?)</a><a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="展开">[+]</a></p>
<h4 id="git多用户冲突一"><a href="#git多用户冲突一" class="headerlink" title="git多用户冲突一"></a>git多用户冲突一</h4><p><strong>场景：dev 分支修改了 File1，master 分支更新了远端代码后也修改了 File1 的同一个代码块，dev 变基到 master 时会产生冲突</strong><br><strong>解决方法：</strong><br>case 1 ：如果希望 master 分支完全覆盖 dev 分支的修改，使用如下命令回退后变基：</p>
<pre><code>git reset --hard
git rebase master

  * 1
  * 2


  * 1
  * 2</code></pre><p>case 2 ：希望保留 dev 分支的改动。如果 dev 分支的改动没有commit，需要暂存变更，变基后再手动合并冲突，使用命令如下：</p>
<pre><code>git stash
git rebase master
git stash pop         // 会有冲突
git diff ***          // 手动合并冲突，***代表文件名
git add ***           // 修改完成后提交
git rebase --continue // 完成变基

  * 1
  * 2
  * 3
  * 4
  * 5
  * 6


  * 1
  * 2
  * 3
  * 4
  * 5
  * 6</code></pre><p>其中 <a href="http://lib.csdn.net/base/git" target="_blank" rel="noopener" title="Git知识库">Git</a> stash 表示备份当前工作区内容到 <a href="http://lib.csdn.net/base/git" target="_blank" rel="noopener" title="Git知识库">git</a> 栈，并使当前工作区内容与上次提交时一致，更新最新代码，git stash pop 表示从 Git 栈中读取最近一次保存的内容，恢复工作区的相关内容，git diff 表示手动 merge 冲突的文件</p>
<p>case 3 ：如果本地已经 commit，使用如下命令撤销最近一个 commit，再执行步骤2</p>
<pre><code>git reset HEAD^

  * 1


  * 1</code></pre><h4 id="git多用户冲突二"><a href="#git多用户冲突二" class="headerlink" title="git多用户冲突二"></a>git多用户冲突二</h4><p><strong>场景：用户 UserA 提交了 change A，暂时没有 review，未被 merge 到远端主分支。之后用户 UserB 提交了change B，merge 成功。当 merge change A 时出错</strong></p>
<p><strong>解决方法：</strong><br>1 . gerrit 上 Abandon change A</p>
<p>2 . 本地撤销此次提交</p>
<pre><code>git reset HEAD^

  * 1


  * 1</code></pre><p>3 . 更新代码，重新提交</p>
<p><a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener"></a> <a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="分享到QQ空间"></a> <a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="分享到新浪微博"></a> <a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="分享到腾讯微博"></a> <a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="分享到人人网"></a> <a href="http://blog.csdn.net/twilightdream/article/details/72953313#" target="_blank" rel="noopener" title="分享到微信"></a> .</p>
<p>顶<br>    0</p>
<p>踩<br>    0<br>.</p>
<ul>
<li>上一篇<a href="http://blog.csdn.net/twilightdream/article/details/72953282" target="_blank" rel="noopener">Ubuntu 上 gerrit 服务器的搭建</a></li>
<li>下一篇<a href="http://blog.csdn.net/twilightdream/article/details/72953324" target="_blank" rel="noopener">git 推荐流程</a><br>.</li>
</ul>
<h4 id=""><a href="#" class="headerlink" title=""></a></h4><p>  相关文章推荐 </p>
<ul>
<li><em>•</em> <a href="http://xiebinghu.iteye.com/blog/1844967" target="_blank" rel="noopener" title="Git详解之五：分布式Git">Git详解之五：分布式Git</a></li>
<li><em>•</em> <a href="http://blog.csdn.net/u012150179/article/details/14047183" target="_blank" rel="noopener" title="Git使用之——冲突解决一（git merge conflict）">Git使用之——冲突解决一（git merge conflict）</a></li>
<li><em>•</em> <a href="http://webdev2014.iteye.com/blog/2027807" target="_blank" rel="noopener" title="珊珊来迟的解决方法——VB中防止多用户登录">珊珊来迟的解决方法——VB中防止多用户登录</a></li>
<li><em>•</em> <a href="http://blog.csdn.net/stephenzhu/article/details/6320955" target="_blank" rel="noopener" title="SVN多用户同时修改一个文件冲突过程分析及解决方法（非用锁方法）">SVN多用户同时修改一个文件冲突过程分析及解决方法（非用锁方法）</a></li>
<li><em>•</em> <a href="http://sydica.iteye.com/blog/2064856" target="_blank" rel="noopener" title="node.js 初体验">node.js 初体验</a></li>
</ul>
<ul>
<li><em>•</em> <a href="http://sdhsdhsdhsdh.iteye.com/blog/741635" target="_blank" rel="noopener" title="多用户(windows)远程登录ubuntu 10.04 解决方案">多用户(windows)远程登录ubuntu 10.04 解决方案</a></li>
<li><em>•</em> <a href="http://blog.csdn.net/happyer88/article/details/50722665" target="_blank" rel="noopener" title="git配置和常用命令">git配置和常用命令</a></li>
<li><em>•</em> <a href="http://blog.csdn.net/zmissm/article/details/39103147" target="_blank" rel="noopener" title="Git详解">Git详解</a></li>
<li><em>•</em> <a href="http://jjz.iteye.com/blog/105075" target="_blank" rel="noopener" title="网站多用户权限管理的一个解决方案">网站多用户权限管理的一个解决方案</a></li>
<li><em>•</em> <a href="http://blog.csdn.net/zhu1991_/article/details/54017247" target="_blank" rel="noopener" title="【SVN多用户开发】代码冲突&amp;解决办法">【SVN多用户开发】代码冲突&amp;解决办法</a></li>
</ul>

  </div>
</article>



        
          <div id="footer-post-container">
  <div id="footer-post">

    <div id="nav-footer" style="display: none">
      <ul>
         
          <li><a href="/">Home</a></li>
         
          <li><a href="/about/">About</a></li>
         
          <li><a href="/archives/">Writing</a></li>
         
          <li><a href="/projects_url">Projects</a></li>
        
      </ul>
    </div>

    <div id="toc-footer" style="display: none">
      <ol class="toc"><li class="toc-item toc-level-1"><a class="toc-link" href="#git-多用户冲突解决"><span class="toc-number">1.</span> <span class="toc-text"> git 多用户冲突解决 </span></a><ol class="toc-child"><li class="toc-item toc-level-4"><a class="toc-link" href="#git多用户冲突一"><span class="toc-number">1.0.0.1.</span> <span class="toc-text">git多用户冲突一</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#git多用户冲突二"><span class="toc-number">1.0.0.2.</span> <span class="toc-text">git多用户冲突二</span></a></li><li class="toc-item toc-level-4"><a class="toc-link" href="#null"><span class="toc-number">1.0.0.3.</span> <span class="toc-text"></span></a></li></ol></li></ol></li></ol></li></ol>
    </div>

    <div id="share-footer" style="display: none">
      <ul>
  <li><a class="icon" href="http://www.facebook.com/sharer.php?u=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/" target="_blank" rel="noopener"><i class="fab fa-facebook fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://twitter.com/share?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&text=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-twitter fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.linkedin.com/shareArticle?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-linkedin fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://pinterest.com/pin/create/bookmarklet/?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&is_video=false&description=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-pinterest fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="mailto:?subject=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET&body=Check out this article: http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/"><i class="fas fa-envelope fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://getpocket.com/save?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-get-pocket fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://reddit.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-reddit fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.stumbleupon.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-stumbleupon fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://digg.com/submit?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&title=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-digg fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="http://www.tumblr.com/share/link?url=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&name=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET&description=" target="_blank" rel="noopener"><i class="fab fa-tumblr fa-lg" aria-hidden="true"></i></a></li>
  <li><a class="icon" href="https://news.ycombinator.com/submitlink?u=http://yoursite.com/2016/08/03/git%E5%A4%9A%E7%94%A8%E6%88%B7%E5%86%B2%E7%AA%81%E8%A7%A3%E5%86%B3-twilightdream%E7%9A%84%E4%B8%93%E6%A0%8F-%E5%8D%9A%E5%AE%A2%E9%A2%91%E9%81%93-CSDN.NET/&t=git多用户冲突解决-twilightdream的专栏-博客频道-CSDN.NET" target="_blank" rel="noopener"><i class="fab fa-hacker-news fa-lg" aria-hidden="true"></i></a></li>
</ul>

    </div>

    <div id="actions-footer">
        <a id="menu" class="icon" href="#" onclick="$('#nav-footer').toggle();return false;"><i class="fas fa-bars fa-lg" aria-hidden="true"></i> Menu</a>
        <a id="toc" class="icon" href="#" onclick="$('#toc-footer').toggle();return false;"><i class="fas fa-list fa-lg" aria-hidden="true"></i> TOC</a>
        <a id="share" class="icon" href="#" onclick="$('#share-footer').toggle();return false;"><i class="fas fa-share-alt fa-lg" aria-hidden="true"></i> Share</a>
        <a id="top" style="display:none" class="icon" href="#" onclick="$('html, body').animate({ scrollTop: 0 }, 'fast');"><i class="fas fa-chevron-up fa-lg" aria-hidden="true"></i> Top</a>
    </div>

  </div>
</div>

        
        <footer id="footer">
  <div class="footer-left">
    Copyright &copy; 2020 Tmoonlight
  </div>
  <div class="footer-right">
    <nav>
      <ul>
         
          <li><a href="/">Home</a></li>
         
          <li><a href="/about/">About</a></li>
         
          <li><a href="/archives/">Writing</a></li>
         
          <li><a href="/projects_url">Projects</a></li>
        
      </ul>
    </nav>
  </div>
</footer>

    </div>
    <!-- styles -->

<link rel="stylesheet" href="/lib/font-awesome/css/all.min.css">


<link rel="stylesheet" href="/lib/justified-gallery/css/justifiedGallery.min.css">


    <!-- jquery -->

<script src="/lib/jquery/jquery.min.js"></script>


<script src="/lib/justified-gallery/js/jquery.justifiedGallery.min.js"></script>

<!-- clipboard -->

  
<script src="/lib/clipboard/clipboard.min.js"></script>

  <script type="text/javascript">
  $(function() {
    // copy-btn HTML
    var btn = "<span class=\"btn-copy tooltipped tooltipped-sw\" aria-label=\"Copy to clipboard!\">";
    btn += '<i class="far fa-clone"></i>';
    btn += '</span>'; 
    // mount it!
    $(".highlight table").before(btn);
    var clip = new ClipboardJS('.btn-copy', {
      text: function(trigger) {
        return Array.from(trigger.nextElementSibling.querySelectorAll('.code')).reduce((str,it)=>str+it.innerText+'\n','')
      }
    });
    clip.on('success', function(e) {
      e.trigger.setAttribute('aria-label', "Copied!");
      e.clearSelection();
    })
  })
  </script>


<script src="/js/main.js"></script>

<!-- search -->

<!-- Google Analytics -->

<!-- Baidu Analytics -->

<!-- Disqus Comments -->


</body>
</html>
